Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Mon, 17 Oct 2005 13:12:20 +0000 (14:12 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Mon, 17 Oct 2005 13:12:20 +0000 (14:12 +0100)

Trivial merge